
public class Teste {
	
	public static void main(String[] args) {
		System.out.println("teste SVN");
		
		System.out.println("mexendo");
		
		System.out.println("erro merge");
		
		System.out.println("testando conflito");
	}

}
